bitkeeper revision 1.1159.173.1 (4198cc1etdf5hNRh765kjOv76JOjog)

Run "reboot machine" keyhandler from interrupt context.

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index d6eb85250bf11d760c41c1a3d4fc680185d35bd6..a5cf77aa5713d854934c5d384518d5e5ac5db5c0 100644 (file)
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -89,7 +89,7 @@ static void dump_registers(unsigned char key, struct xen_regs *regs)
     show_registers(regs); 
 }
 
-static void halt_machine(unsigned char key)
+static void halt_machine(unsigned char key, struct xen_regs *regs)
 {
     printk("'%c' pressed -> rebooting machine\n", key); 
     machine_restart(NULL); 
@@ -169,7 +169,7 @@ void initialize_keytable(void)
         'q', do_task_queues, "dump task queues + guest state");
     register_keyhandler(
         'r', dump_runq,      "dump run queues");
-    register_keyhandler(
+    register_irq_keyhandler(
         'R', halt_machine,   "reboot machine"); 
 
 #ifndef NDEBUG